Update to 5.4.0