changed default behaviour: add only minimal set of privileges by default
Merge remote-tracking branch 'origin/master'