(cherry picked from commit 6abd991c) (cherry picked from commit 3dabd7f8)
mentioned in commit 78aaf43b