(cherry picked from commit 95ee7fb1) Typo fix as in commit 45ef6628 and NEW enty adjusted to reflect revert occuring in 2.19.1 and 2.20. Conflicts: NEWS