Preparing for CFS 1.8.9