Merge branch 'core48'