Fix changes which are merged in the meantime

3 jobs for introduce-test-build in 7 minutes and 3 seconds (queued for 2 seconds)