Merge "Adding maximum input size checks"