make cf addition more flexible
changelog
Merge branch 'release/1.2' into develop