Merge "Don't convert to strings only to convert to int." into ub-gmail-ur12-dev