test 4512d234-0f46-4f4e-864f-59934e485d50 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote