(cherry picked from commit 6637e3cf95b3a9be8d6b9cd66bc849a0607e8ed5) (cherry picked from commit a066134277716a9709b63cfb11b4be5627a9bd3f)