revert 538e58c915e777265361e37d0dc6efd04c2ee448
Merge branch 'master' into 3810-ProjectTemplates