test 53526f1a-553d-4fa4-8b23-6698225c5053 (rebased onto develop)



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

----

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