Bump to v2.1.8