fix core
Merge branch 'diffbot' into diffbot-testing