(cherry picked from commit b4ac9d1b63dd4031eee8b17d2462087721050b9a)
(cherry picked from commit 749ca890e6e62671b4df69d020396ec93edadf16)