Merge "Add containsOption method to OptionSelectorController" into sc-dev