(cherry picked from commit 3ca72ad9)
mentioned in commit 3e379242
mentioned in commit 63a062dd
mentioned in commit bea77134
mentioned in commit 7d207e36