(cherry picked from commit 8bfd0493b2690df65ae13cf2c2a59689555631b8)
(cherry picked from commit ad3c5fcee5648d942512a31faf3cab4f15272d85)