Upgrade to v5.0.5