test 937f5322-358c-44cb-93f6-196efbabe19e (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault