(cherry picked from commit 9f7c9eff963de43e64f2de8ca2119167b7a3e4f5)
(cherry picked from commit 18e4b1f33eb5bb803bc35100f80b61fd82642645)