Merging latest developments to the ui_revision branch