Merge dev-15-unit-test-ui