test d198c7d7-6a94-485d-8065-81757eb2cafd (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote