Merge branch 'jc/core-checkstat'