Merge branch 'gt/core-bare-in-templates'