test 387cf9b9-0cd4-49a9-a666-606647c6bcc6 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault