test 36227d86-32c1-4754-92b4-f8c5aa915662 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote