Merge branch 'classmate' into release