Merge "Security Fixes"