Merge branch 'fix_dictionary_colon_in_ternary' into global_integration