- Changes due to refactorings in core