test f98f3738-1de6-44b0-9e36-57b77527c1ce (rebased onto develop)



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

----

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