(cherry picked from commit b0335b4b403b520d19a2163dbad8c199e08bb41b)
(cherry picked from commit a26830f7286119271b1aee9246ff1060af4dbef0)