backporting changes and updates. Removed view audit, fixed audit_meta behavior