Pull request coredev scarpazi

pull request fot merging coredev