(cherry picked from commit a3c7af7c8cdb4a0b0abe60ec3e5b80af4ec20f63)
(cherry picked from commit 71bcca71cd56a5042c4b867bf51a17c3d33ac985)