Merge "Check permissions only against packagesettings" into pi-dev