test c93a4f12-809f-4eef-8a98-73ca1f1dbb96 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault