(cherry picked from commit 5f9eb6b9c78239ffb586eea98feaf3e6c30981f9)
(cherry picked from commit 68b621471197105b2a846a2827afdaa23ec03edc)