Merge branch 'schemup-integration' into clck