Merge "Added missing label and char limits"