test f934a3e5-7033-4971-8a2f-48058e8f71b6 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault