Merge branch 'release/0.2.0'
Merge branch 'release/1.5.0.11'
fixes for applying layer overrides
Merge branch 'hotfix/template_fix' into develop