(cherry picked from commit 056101988b10c7adf1ee7bd62c1e8e6003bf3943)
(cherry picked from commit 4a1b7f8af6d3ead795434d4ffa6cfccfa405f68a)