Merge "Add deployed-server backwards compatible template"