Zhen--can you review the 2.5.x-related merges in this SAK. It looks like a fix to SiteParticpantHelper (r66721) may still need to be merged to 2.5.x. http://jira.sakaiproject.org/browse/SAK-14046 Cheers, Anthony