test 8bf870ee-91ca-4768-bab2-0165b446dab2 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue