test 6561d746-eeb0-4bc2-9325-b3ef2eca5575 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote