Merge "enable cadf auditing support"