Upstream merge
New patch build