Integrate some changes from demoUI branch that are useful for the base platform.