test 5ae52389-85fa-4e8a-9cfc-418c02c71ba5 (rebased onto develop)



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

----

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