Apply template cleanup from commit cf8d6988 to master branch