Import 2.16 from upstream