test f631ccf1-71a2-43f9-a599-275e2e2834ea (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testRemote