(cherry picked from commit f760c9af61cb22e237bc74d9713172c462556c82)
(cherry picked from commit 6223586fd46b7d34739af4c3bfbc7d92a237a1e8)