add package-permission forms
Merge origin/master