(cherry picked from commit d2700ab7ebb13cc948a7cbacbd336a04b2f2bc93)
(cherry picked from commit 1d10593e6f65a5a8abc9f57b1baacfc460298280)