Merge "The UI is not immediately updated" into sc-dev