(cherry picked from commit 3c3335c7) (cherry picked from commit 12600fdc)
mentioned in commit 5ab6d9fd