Merge branch 'hotfix-2.1.12'
Merge branch 'hotfix-2.1.12'
Merge branch 'hotfix-2.1.12'
Merge branch 'hotfix-2.1.12'
Removed vulnerability and comment from correlation
Merge branch 'hotfix-2.1.13' into develop