Merge branch 'master_MDL-31856_choice_responses_inconsistently_displayed' of git...