test 2234373e-7c55-4705-9ebf-1336a419e2c7 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by gration.TestRebase.TestRebaseNewBranch.testDefault