(cherry picked from commit 051207375b30ffa126cf9c961ee97535c1dfabb1) (cherry picked from commit 601591c02144c9c0dfed2c4011187dc7bb329157)