test 62c37fa5-3597-47f9-8994-ca066cf0821e (rebased onto develop)



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

----

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