test 424a6b12-e48a-4509-b80e-d6b7d02b1c91 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote