Upstream merge
Updated patches