Update to N2 2.5.2.1