Fix merge error, use latest AHC snapshot