Bug fixes

128 jobs for !559 with eshields-d02kshh in 15 minutes and 48 seconds (queued for 4 seconds)
latest merge request