Upgrade AHC 1.7.16, close #1192