Merge branch 'application-to-generator' into 'develop'