test 8edffc1f-1831-43ee-9276-4dc2fe8b8cd9 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue