(cherry picked from commit 3afda7c7) (cherry picked from commit 31875b3c) (cherry picked from commit 0dccd1f8)
mentioned in commit 699f1c9e