Upgrade to 2.8.7+ partially worked