(cherry picked from commit 44b62dc88af07cc91a6cb523fa8cd3037c3c66be)
(cherry picked from commit 7847f38213109046bc356616b236865ef5dc708f)