Merge "Make CodeItem fields private"