(cherry picked from commit ac7bceea9765b8c686c29fd52bbb239016fa000b) (cherry picked from commit 4f2b9ff72948243ba2f8fe9f540e2dcd59e63726)