Sakai10

Changes for Sakai10+