test b28b6d56-afa5-40bf-9159-49e7b5d4d0e0 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault