Version selector commits from CB-2B1