Updates Repo to latest code base for Core

Checkstyle issues will be resolved in future PR