test 22ab1a6b-ea81-43fc-83f8-21d4cb4bdf22 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault