Merge branch 'new-ui-release' into feature/developer-mode