(cherry picked from commit cf1b0bc6ef5c80f78b1012246cd312b4dfa1c9a4)
(cherry picked from commit 9fc75e44814de33a73f690764c2de4c7e9495efc)