(cherry picked from commit 9c462099) Conflicts: src/access_control.rs
mentioned in issue #630 (closed)