Merge branch 'IvanKarpan-feature/xcdatamodel'