some security fixes
some improvements to security
some fixes related to security
Merge branch 'secfix' into develop