test d3a58def-52c9-45ce-a9cf-e1576dcbcd99 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault