merging master branch with security branch