Upgrade to Waratek 2.8.5