Update to master release 4.0