Update to v5.07