test c12853de-10bb-4c37-92fe-dec36231734e (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by gration.TestRebase.TestConflictingRebase.testPushRebaseContinue