Merge branch 'master' into fix-gui-deadlock

8 jobs for fix-gui-deadlock in 158 minutes and 52 seconds (queued for 2 seconds)