Adding support for eqc in cf format
Merge commit 'a9c28c04cf0531e7952af28a2295659ceae930fe' into HEAD