test fd4baf64-7552-4200-a55f-59fb7d694cde (rebased onto develop)



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

----

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