test e158a579-cdee-44bf-b588-0fa579e47e32 (rebased onto develop)



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

----

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