test 77e237ce-2794-4314-975d-baf5bd57da67 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote