test 4c80960b-8892-46bc-8e30-83ebeec858e9 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue