Chery pick merge for RAZ.2870