feature -> bug in NEWS
Merge branch '629-inf' into develop