Upgrade to v2.3.1