Fixed issue #7146: Security issues
Merge remote-tracking branch 'origin/master'