(cherry picked from commit 94ec64cd) (cherry picked from commit b13874f6) (cherry picked from commit 057d511a)
mentioned in commit 0518a693