(cherry picked from commit 26afe287217da1a1bea447e834f64a311adcfba8)
(cherry picked from commit f760c9af61cb22e237bc74d9713172c462556c82)