test 16e416fd-3a5e-46d3-89c6-b80844a4568c (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote