minor changes for cb compat
Merge branch 'ja-cb-round-1' into develop