Updated for HHH-8096