Upgrade AHC 1.8.4, close #1719