Merge branch 'jc/core-checkstat-2.0'