implements #18728
Please also cherry-pick to testing.
@chhitz I added some notes to the ticket and assigned it to you with feedback, I do not see us doing anything wrong, I guess we need some help from the cloud team so they can tell us why the call that we issue suddenly fails.