test 30373c9c-8d9c-48fe-8e98-37e8c4fb1783 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault