Move Check Stats into CIB.

Fixes #5617