Merge branch 'en/diffcore-rename'