device: fix cfx vendor inherition
Merge branch 'jb-devel' into jb-devel-release