58 Commits (revert-6434-bugfix-missing-s3-audit)