Fixed problem with scaffolding
Merge master to staging for version team city build 1.0.164