(cherry picked from commit 43001bee9f1183de91b9ad08580f6bdb79e73bcf)
(cherry picked from commit 14f3fd3cd712473f67739a462395eff92dee6315)