test 14584c57-b598-46d9-a7f0-e36d119f1df3 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote