Upgrade to 3.8.4