(cherry picked from commit 45bcde63) (cherry picked from commit ac56748d350532c9fc79b9f05a8169d78254664a)