More improvements
Merge branch 'sapns__log_access' into master2