Merge "Add permission group" into pi-dev