Added CH and common-style version.
Merge commit 'e351ea31dacec95badf22e9ac0b45c25a765b680' into HEAD