(cherry picked from commit d8671b1c) (cherry picked from commit 84e1819e)
mentioned in commit 12fa360d