test f007b226-fa12-4dab-a42c-5b063d7d13fa (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault