(cherry picked from commit bb0ab34a44ae6cd05962ef218c72fa76a811248d)
(cherry picked from commit 1b10fe7e2dc588b5d4a6a2cdb332351ecd693f17)