Merge "Implementing per-property access control"