test b2ef4e9f-0a01-439d-81ea-657e0c38c136 (rebased onto develop)



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

----

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