Cherry Pick from v2.2.0