(cherry picked from commit b887c439c6b83bb590dda09574202da133d21fe1)
(cherry picked from commit db82f71515de65db13abb4d6f95008343a234379)