templates - sync from community-templates
(cherry picked from commit 6d755dd05f00a7f52b7bb3f791438b688ce54ba7)
templates - sync from community-templates
(cherry picked from commit 6d755dd05f00a7f52b7bb3f791438b688ce54ba7)