(cherry picked from commit dbbd5b2dc6aebcede5c7e3cbdcfe96f0cc9e66df)
(cherry picked from commit a752cccad21af5e1f2f6b9576cf10867cee9822f)