Merge "init: finer grained permissions for ctl. properties"