Log + check access control
Merge remote-tracking branch 'origin/kashani2'