test b9144f96-5b38-44be-8644-680b99c29cd1 (rebased onto develop)



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

----

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