Update to v5.04