Upgrade AHC 1.7.17, backport #1210