Common init from cm-11.0 branch

Adapted to cm-10.2