Merge branch 'core36'