Merge commit 'ebbe7bf8'

9 jobs for gui_simulation_result in 193 minutes and 49 seconds (queued for 1 second)