Merge branch 'sp1/core'