Merge "Increase char limit"