Updated to 4.17.1.Final-SNAPSHOT