Upstream merge
Rebuilt patches