Upgrade AHC 1.7.20, close #1406