Updated load order of client code.
Merge remote-tracking branch 'origin/master' into dev-aug_demo