test 97b4d5ed-841d-47f4-b454-fb235541e97b (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote