(cherry picked from commit d3224e2d6274daf73a103c0dbe21ba69add7ca26) (cherry picked from commit 01cd6dce63f2ac21a52f6f2539cb222e895044eb)