(cherry picked from commit c560069c0802d62f4e402ff2737732b08122cccd)
(cherry picked from commit ee489335fc3c47d6dd7ba235a0df0e35411035a1)