test 6f408c9f-431e-4e60-b364-2aca7634f0cd (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote