Merge "More adjustments to permissions." into jb-mr1-dev