test 883f0130-6862-42e2-9c04-2628cc20e566 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote