Two patches that are added in this commit are already upstreamed, so they should be removed with next update.