test b2efd440-786c-40f2-a3e4-f1c755d09233 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote