Catch up branch: IEditable_refactoring