(cherry picked from commit 3bac86ab)
mentioned in commit 89395b63
mentioned in commit 3976f244
mentioned in commit 988e4363