test 16adef63-edd5-4900-bc62-dd08df9abae4 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault