Init user editing, update core
Merge