Merge "moving virtual labs to new templates && system update"