test 538a0784-46b9-4113-a4d7-23b8748a6f97 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote