Merge branch 'feature/contentProvider' into develop