(cherry picked from commit a3ccf87b01f071e2bf9db89e4248c730226d059c) (cherry picked from commit e1ab63906ac4761e0ae2ebfe040854f335f46476)