Update for v3.1-RC3X release