test f8079af6-1300-4127-b409-0843bc07edbd (rebased onto develop)



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

----

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