Merge "API Changes and Update Activity" into main