(cherry picked from commit b9ab22dad170349cfab009ea71d98ed1dabbe000)
(cherry picked from commit 044754cdb4cd78543ce9550d8b45923dd82ef8bf)