Merge "0-click UI update"