Merge "Sync changes between IP and IP_JB."