syncing with upstream community-templates