Merge branch 'nd/config-core-checkstat-doc'