V1.2.x

Cherry-picks