Upgrade AHC 1.7.13, close #1072