test 2d3f9943-db4d-474a-9eb8-9936b3aadb79 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault