(cherry picked from commit d6325745e26d6acb0bbdb0972ce036297d66d5b0) (cherry picked from commit d260478d3a8bc6bc7dce32733920bb4812c883bf)