Merge branch 'jc/core-checkstat' into maint