test f7c498fc-a62c-4f62-a659-ee768c433c02 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault