Merge controlsv3 back into master (Beta)