test b59fc555-9d77-4069-a943-f538fe01ab67 (rebased onto develop)



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

----

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