(cherry picked from commit a37aeda48aa4239cd110e665c837c730edb4b800) (cherry picked from commit fea8acbc6790fa23fe5b3121b38a3c218c694c09)