We have to protect the template changes with the
ferature flag check to avoid leaking the refactoring to
the flag-disabled scenarios