Upgrade AHC 1.7.18, backport #1268