Merge remote-tracking branch 'origin/master' into bugfix/6439-fix-cleanup-of-nightly-built-ISO-images