test ab49bb01-1bce-4735-8dc2-497d597282d9 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue