#1563060 refactor auditing to history: part one