(cherry picked from commit 3bac86ab) (cherry picked from commit 47741ff9)
mentioned in commit 3976f244
mentioned in commit 988e4363