Merge "Fix signed/unsigned conversion warning"