test b385ddfc-7504-4e4e-aa52-fe57406cc860 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote