Resolve integration conflicts

from merging branch “ui-design” into master