test 392a4bce-6eb5-4c7c-b105-0d507aae31d5 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testRemote