(cherry picked from commit 12d09877f421df3de1c2104b7a5529d28d5663db)
(cherry picked from commit fdb5600f2a2aca9219e26f95937ce4d54292f973)