Merge branch 'wspp-schema'