(cherry picked from commit 9f9ffdf)
(cherry picked from commit dfadd17) (cherry picked from commit 49b07a7)