Merge/Squash ui-dev branch