test c35a5cfc-6514-42d4-a7db-c2f788e0ded5 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue