test 78450bb7-ff09-44af-8134-eeae8d305e37 (rebased onto develop)



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

----

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