MASTER - Update on some commits in Repocore