Fix references to :base-template-id and :template-properties on the frontend.
Merge commit 'f4613f99c2cfcc69eff04d83dcccef49afb65c72'