test 4050994d-8b04-433a-906c-e21e8f40cc6a (rebased onto develop)


This is the same as gh-10979 but rebased onto develop.

----

This is a call to Sandbox.open_pr by testRemote