(cherry picked from commit 6685381fd8db507493c3d7c1793f8c05c681bbce)
(cherry picked from commit 53b8ee7866eb1394980b08b90153a63563832391)