Port feature/27630 to new meta template structure (fixes #27630)