reject fixes
fixing changing security
Merge branch 'master' into testing