REACH-155 Merge the Customizer branch into Reach

Merge of Customizer->Reach branch