Update for 2.3.1 release