Upgrade AHC 1.8.1, close #1623