test 0c1ba7c6-c8f6-4941-a323-485240afcb69 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote