test bb0507e8-8ba6-4eda-85d0-6c22ece89ee6 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault