Update to v4.07