CF10 compat fixes
pull in cf10 fix from master