Update to stable 4.0