(cherry picked from commit a11d8db8e5f44a5dd6b482483ae6dc2cdf4397fb)
(cherry picked from commit a5bb20f35b1c8c3375d5c62038bb4c79766fe8b1)