(cherry picked from commit f18b13fb22f03b951f186d0010a783db70e13ef3) (cherry picked from commit ab7dcea2)