test 2f563d15-045d-4619-89ba-032c14db4dbc (rebased onto develop)



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

----

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