Improved security terms directive
Fixing merge conflict