Security auditing

From C-7KDB897