(cherry picked from commit 29d30ae7) (cherry picked from commit a453d633)
mentioned in commit 13be03ae