Merge "Completely fill in permission info" into pi-dev