Upgrade AHC 1.7.22, close #1539