test c79b532b-03da-499b-9648-538f64ffe22f (rebased onto develop)



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

----

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