refactor user-data
Merge branch 'user-build'