(cherry picked from commit 68868dbe7e14c45dcb44d2ef4860bca1aaa9e085)
(cherry picked from commit c6e3325c5fc233470f4e4292f88eea8c7923de13)