test 0bca2ee0-caeb-4538-9397-0c8d3a556c38 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testDefault