(cherry picked from commit e558d4f4) (cherry picked from commit 0881deb1)
mentioned in commit 30044d26