Porting jira-191 to 1.19
Some logging updates for AH port
Small simple refactor in AhRecordHelper