Merge "Finer grained permissions for ctl. properties"