Upgrade AHC 1.7.11, close #998