Backported 2.3.1 to 2.2.1; hence updated NEWS