test b2e19f9b-05cc-40ea-8870-6d5c1faafadd (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue