Merge branch 'schemup-integration'