Upgrade AHC 1.8.9, close #1883