This depends upon pull request #2724.