* Chase cfdict format change

(cherry picked from commit 802c4b4ad865c4abc3d06c49d1aea8b7bf3ef509)