fix delete and findall
fix merge master
missed a fix
Merge branch 'master' into permission_service