test 748c56db-9e45-4a3f-926c-ed8dd3779f2b (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault