Upgrade to 1.8.4