Merge remote-tracking branch 'origin/173-allow-mandatory-flag-in-questioncollections-for-multiple-choice-questioncollections' into 173-allow-mandatory-flag-in-questioncollections-for-multiple-choice-questioncollections