idem
C-code optimizations
updated the NEWS
resolved merge conflict