Merge "Sync IP JB sources with mr2."