fixes in cform
Merge branch 'master' into edge