test 63b02175-d384-4a11-a8f1-8ca235b1f953 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote