test d91566b7-7f20-41d0-837a-fcd689f62325 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote