test 668e887c-e55c-4d3c-9901-8e9eab6138e8 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote