Merge branch 'core40'