test 3347b62f-1c50-4eee-b267-5225b7073185 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault