Cherry picking ui-project changes & tests from master