some security fixes
fdgh
a
a
a
merge
merge