test c9da6b74-cc9e-4525-8428-630d85d717bf (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue