Merge conflicts between advancedUI and Refactor