Upgrade AHC 1.7.15, backport #1104