(cherry picked from commit 4e4aba6ff1d9d5ad8343c4c4fc7d5b3d4a7cafd6)
(cherry picked from commit a07e0dd88f047591d57aaa45ca64d364dda196aa)