Merge "Update char limit for DND conditional"