- Removed content access from features
Merge into master