Upgrade AHC 1.8.3 #1685