Upgrade AHC 1.9.0-BETA20, close #2345