test 6d658445-c35a-48d4-83e6-3c99ac94a500 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote