(cherry picked from commit f4425c72) (cherry picked from commit 5926f9f1)
mentioned in commit 9131bb3d