issue #22067: finish returns

There's a pull request in private-extensions as well.