(cherry picked from commit cf305b73021d94bd28e2cc0aea7530829b221d6a)
(cherry picked from commit 9d32d0a65fc1830075b8858f0ab6e10ebf259772)