Coredev scarpazi

pull request fot merging coredev