test ff7a4738-9c6e-48f2-81d1-5e8489a60b09 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote