WL-3318 and merge with Sakai mirror