Merge "Fix a bug where a user dict entry is too long"