test 607856dc-0cba-46e2-b1bc-0c517cee1cb7 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote