Required changes are in PR #652.