test b36dd482-a452-4a7e-bab7-cd70bcf1b6b5 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote