support auditing interface
(cherry picked from commit f75532c)