Merge "[Forensic] Added Security Logging" into main