Included raptor's recent PRs that conflicted