test 3330c80f-0c91-48ef-97b4-dc2efdff4f37 (rebased onto develop)



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

----

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