Preparing CFS 1.9.4