(cherry picked from commit 1d406dce) (cherry picked from commit 409c6a89)
mentioned in commit a49997bb