UIChanges for v2
Merge branch 'UIChanges'