Upgrade AHC 1.7.18, close #1268