Merge branch 'core-parse'