Fix NPE when editing existing multiple choices
Merge branch 'topic_au_rationale' into topic_au_rationale_np_merge