Merge conflicts between advancedUI and FixTesting