(cherry picked from commit 3f49d1fa) (cherry picked from commit b511a441)
mentioned in commit aa29dccb
mentioned in commit 55f79382