Adjusted build for compiled templates
Merge branch 'master' into behaviors-support