test dc46aa1f-bc00-4033-8913-6524953cad44 (rebased onto develop)



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

----

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