test 845138c3-cecc-469c-ab99-d60fc4d85335 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testDefault