Update to 3.5.4