Upstream merge + remove 3 pulled patches.