Fixes ZEN-15617

audit updates