Merge "Fix wrong userData length and excessive userData issues"