(cherry picked from commit cbb239117dfbece522f1323bdfef6d83b96506ca)
(cherry picked from commit 18e4b1f33eb5bb803bc35100f80b61fd82642645)