test dc65caee-5ba1-458a-96c0-275b55ea7376 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote