(cherry picked from commit 8fb258ddb530686d2be197a1a6399538044e7910)
(cherry picked from commit deeb5846e2486a162e006a0d5ee0c5253fd7161f)