Trying to bring [!58779 (merged)]
to master to see if it actually helps with the CI issues we are currently experiencing.
CI
ping @jojungge and @tsulaia