Security fixes
Merge branch 'security' into devel