Merge commits for WL-3274 into sakai-10.x