Merge pull request #2596 from castillofrancodamian/ahcp