Added security details in linker
Merge origin/master