test f639256f-8da6-4121-9406-49dc543e64c2 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault