Merge "Fix the developer info"