(cherry picked from commit f3ade95b06e0c5eed14d93ef5036632aa21f82af)
(cherry picked from commit f39b8e739a6fd1813539c0c04400cc007cf27926)