templates - sync from community-templates
(cherry picked from commit 013ee65ac3a0632c3f8227fefab71c1c8e37edee)
templates - sync from community-templates
(cherry picked from commit 013ee65ac3a0632c3f8227fefab71c1c8e37edee)