test c4aec8ec-227d-4d67-9686-7b390a28906e (rebased onto develop)



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

----

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