test fbaa2dc4-0252-4548-be33-fd2fc0577539 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote