test e372d514-616d-4afe-bb1f-e6038fc8336c (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote