Merge "Bump upstrems" into 0.16.x