Upgrade AHC 1.7.24, close #2417