test 5f0a2e06-7ec7-401d-80d6-0f82c97b6ad2 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue