Merge "Enhance Security Logs for Clarity" into main