Merge "SECURITY: Improve css javascript detection"