Update for 3.1.7