(cherry picked from commit 354d837df087d7719bfa63e2faeef7e00f13242b)
(cherry picked from commit a7d9e26ab7e5c946aee5ecc5b998fb8810ef1671)