Merge "Fix Requires Parent TemplateId transform hook implementation"