test 85431110-9371-4f56-bee3-deb0c3a08f19 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault