Reverted the merge of the branch CF2008