Merge branch 'OCF222-update-publish-on-interconnected-ccfs' into OCF225-fix-tests