Last second updates for 2.3 release