Update 6.0-SNAPSHOT to 7.1-SNAPSHOT