Upstream merge with 2.2.1