There were a couple of merges since 2.4.4, and we should make sure these got propagated to this repo.