Lazy Loading Part 2
Merge remote-tracking branch 'origin/dev-simplecontactsdemoapp/cgu' into dev-simplecontactsdemoapp/bhe