test 5f3eda1f-ec6e-4e71-96f9-1270a12017f5 (rebased onto develop)



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

----

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