Simple Fixes
Merge branch 'dev-simplecontactsdemoapp/cgu' into dev-simplecontactsdemoapp/bhe