Addional fixes for custom namespace
Merge branch 'handlebars-namespace'