(cherry picked from commit f418035c525599a928f0924d000e5778b7358d54)
(cherry picked from commit 852ccbf7c5a9735476075417ade9eb9398540ab1)