Merge changes from topic 'bugfix/update-ui-compo'