(cherry picked from commit 45102e2a)
mentioned in commit 0de6334e
mentioned in commit 78ab7fd4
mentioned in commit f1069d0a