test 12601c6d-0062-4da2-abae-515ad6ec6c05 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote