Merge master + GUI tweaks

1 job for sim_dev in 1 minute and 41 seconds (queued for 8 seconds)
Status Name Job ID Coverage
  Maven
passed linux_maven_branch #2034655

00:01:41