Added core data manager
Merge pull request #11397 from acerbetti/master

Added core data manager