Merge branch 'core-parser'
Merge branch 'fix-io7-deprecation-warnings'