Merge "Portal/SDK release 2.2.0"