Merge UI branch into master branch