(cherry picked from commit 1d10593e6f65a5a8abc9f57b1baacfc460298280)
(cherry picked from commit 295c3caa684bf5c4279e3219a961b96498c01373)