Merge "Add alternative checkmark for currently selected option" into sc-dev