Looks like those two PRs overlap