Merge "Update automated project templates"