Upstream merge - patches to fix