User edition + UserDataSource refactor
[#84113584]