New upstream version 2.4