test b170b12f-ab5b-4068-9783-f27dd7cd0587 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue