Merge branch 'uidev'
Merge branch 'master' into uidev