test be222b19-0b4b-46fd-9ca6-c19d40ef1432 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue