Editor's drafts for chore/template_sync_f2590c1 branch of VMatrix1900/draft-yi-cats-hybrid-solution