test 3d06db5a-b3c6-494c-b608-5e08ba92e346 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault