test f8ebb8d9-649e-4d61-9593-8c35fa38ce51 (rebased onto develop)



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

----

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