merged local changes related to NSInteger/CGFloat