Final commit before the merging with the nocernlib branch