test 93977b31-191a-43dd-b3d9-f50d52f3e481 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault