(cherry picked from commit f45aa5cac1579e87cbc599ffb58e10e662066792)
(cherry picked from commit 8ce3635d39dbdd101ddf180a66c483162df99c04)