Simplify new jo cf, part 1
Changes aim at simplifying the construction of CF/DF in new JO (there will be several steps). Related to ATR-24348
Changes aim at simplifying the construction of CF/DF in new JO (there will be several steps). Related to ATR-24348