test ffcb98ee-fcb6-4002-9ef2-ac63e4f0c81d (rebased onto develop)



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

----

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