test 4e25d938-956f-4785-88e0-6e5ffa09fdcb (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault