Merge "Bring back new permission organization." into jb-mr1-dev