(cherry picked from commit 4cdab6fb3efe97c26023fba411c0b8af1b67b64d)
(cherry picked from commit 044754cdb4cd78543ce9550d8b45923dd82ef8bf)