Auditing and Logging - test fix
Merge remote-tracking branch 'origin/develop' into develop