Upstream updates for development of 2.1