test 54d63c8e-851c-464b-91de-277e453dbc10 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault