Merge branch 'core51'