test d23761d3-85d8-4805-89be-8e20899a70ce (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault