Merge branch 'rj/bundle-ui-updates'