Fixes most of the audit violations of log exception.
Merge branch 'origin/dev'