(cherry picked from commit 0d293e439ffcbe97db98c1a1b8072e798d94323e)
(cherry picked from commit 235e1ab6ff11856c91e6c5afded3209879ac473e)