test 2fcc3a1e-9ea2-4747-9802-0ea2ebdc15b0 (rebased onto develop)



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

----

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