Merge "Do not call parseInt if value is empty"