test cd422df3-9013-4315-8106-3ffb8eeff1b5 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault