(cherry picked from commit a11d8db8e5f44a5dd6b482483ae6dc2cdf4397fb)
(cherry picked from commit f957e6025c012709b2f98fe9fac290c7f40e92cc)