Changes for release 3.1.7