Merge "Update IP and IP2" into jb-mr2-dev