test 6cad62fc-16ae-4cdf-b950-06906b4e5a1f (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote