(cherry picked from commit ffad5559ae5901f19073c19f7cd4ebcf29b68b3e)
(cherry picked from commit 41038d9e4c3f3ca911db5498a80181efb25505b2)