Merge branch 'cm-10.2' into martincz