Merge branch 'feature/xosContentProvider' into develop