test dde93aab-0b75-464c-b2e5-bcf2c24069a1 (rebased onto develop)



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

----

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