Revert "Revert "templates""

This reverts commit 2518b5790ad56430a53dc6c959ab6d9212171636.
includes