Upgrade to 5.4