Merge !681: various nitpicks, see commits for details

28 jobs for nightly
in 9 minutes and 34 seconds and was queued for 2 seconds
Scheduled