(cherry picked from commit 3afda7c7) (cherry picked from commit 31875b3c)
mentioned in commit 699f1c9e
mentioned in commit 334f8e2e