test 8837ff20-95b9-4bde-99d7-3e78b31f220e (rebased onto develop)



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

----

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