test 4370cf3f-bfcc-4af8-8f34-ba50b1122c51 (rebased onto develop)



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

----

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