Upgrade AHC 1.8.2, close #1631