Changes to do final release 4.0