Merge "Choice and case resolving in JSON output"