Fixed the bugs related to CFF & merged to upstream

did you add the comment about what this file is for?