test a087bdc5-1324-44f3-966e-e601a9e6121d (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote