(cherry picked from commit d27e6aee) (cherry picked from commit 98af14bf)
mentioned in commit b04462a7