Merge "Merge IP changes over to IP_JB"