Merge "Update IP2 UI"