Upgrade AHC 1.7.17, close #1210