syncing with upstream community-templates

Synced templates and ptables