test ddd0efce-6385-4d2d-8b25-044e0488ffa5 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault