applying HL custom changes. Refs #708