test f5c77eed-d667-44b7-8772-599bef849f47 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote