Update to v2.5.4