Upgrade to 3.1.8
Upgrade to 3.1.8