merged new version of cocos with modified df version.