"Merge remote-tracking branch 'ui_dev' into HEAD"

Change-Id: I7145bf693ee76145fef69ee00161099c3fa59d95