Upgrade AHC 1.7.24, close #1580