(cherry picked from commit 75866ff912c0546a7ce6186e14390870f2a63f00)
(cherry picked from commit a213cf4336e4abe30bd40c911c87dc6f85e12807)