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