(cherry picked from commit 72e413df26791b90475ce2f22c31d29e79bd52b9)
(cherry picked from commit fb6e7a30c9eed1e8b83496aaf1efe7e2288f9dd8)