Merge branch 'core37'