build fixes
Merge remote-tracking branch 'origin/UISeparation' into Selection