Merge FixTestingBranch with advancedUI