test 2a6f283e-3509-4671-94a1-f1ae462e8351 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue