Upgrade AHC 1.7.17 SNAPSHOT, close #1207