8.2
fix used class after merge
[Security] Various fixes and hardenings
Merge branch '8.0' into 8.1
Merge branch '7.3' into 7.4