Update happens on the UI side

above
Merge branch 'master' into Lucas-branch
Merge branch 'Lucas-branch'