Clean up core output
Merge branch 'master' into zaalbar