(cherry picked from commit 8f794277205c27dcb0352d791f80e7b7eaabc033)
(cherry picked from commit 32f3aaf38f131f2636c69d72a7b077f25595add7)