(cherry picked from commit 82590f4af933aa56669c9fb0aae9cf8d17ced34e)
(cherry picked from commit c8337770790e031bb38aaf322e43245ebec9993b)