AR-May

@jeromelaban please tell us if the suggestion from @rainersigwald does not work for you.

Team triage: this issue is currently blocked by #9609. We need to improve logging to be able to investigate.

All seems to be done for the release