test 7e83e81c-cc60-4899-8e13-07bca40ede17 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue