Merge master + GUI tweaks

1 job for sim_dev in 1 minute and 41 seconds (queued for 8 seconds)