custom user data fixes
Merge origin/master