r26411 - ChoiceManager refactoring by @Veracity0 in

Top