test 7d00823f-2c80-453f-baca-b02efff58d8d (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote