Upgraded to v2.3.2