Merge "Finer grained permissions for ctl. properties" into pi-dev