test 6300e247-ccf2-401b-acaa-7f2d33fa8de6 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote