(cherry picked from commit 6fc67944bf8a9841b649c8d36f852ce65bbae0e1) (cherry picked from commit f0d1ac606232a02771343f6ad84d4c769ae2ad54)