test 1d99e81c-9b20-4c37-95ca-b1d367182792 (rebased onto develop)



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

----

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