Split sclar value from array value for user data
Code cleaning up
Split sclar value from array value for user data
Merge branch 'user' into package