(cherry picked from commit a07963335549da0e49f13c98cb79adc11df1524b)
(cherry picked from commit 04bd6bff043f66273d0786ab42f97494a0498fc3)