Update to v4.7