Merge "Revert "Update automated project templates""