#12 Upgrade to 7.1.8