Merge remote-tracking branch 'origin/security' into refactoring