Merge branch 'jk/merge-rename-ux'