Zhen--can you review SAK-17232 and it's relevance for the 2.5.x, 2.6.x and 2.7.x branches. Commits have been made to trunk but the issue is not flagged for merging to the three branches. http://jira.sakaiproject.org/browse/SAK-17232 Cheers, Anth