Upgrade AHC 1.7.16, backport #1192