Upgrading to Sardine 5.4