(cherry picked from commit 84ced330)
mentioned in commit 811b137d
mentioned in commit 39a53d4f
mentioned in commit aaad9788