Fixes CXP write
Merge branch 'CXP' into develop