Updates for 3.1.2 GA