Merge "Character limit updates" into lmp-dev