test fcf765ca-ee4f-45b4-bf25-bc38e482722b (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote