That fixed it for me 🙂
Is there any update on this yet? We can no longer set individual blocks to have custom templates and we only use custom templates.