ck-3.18: merge official v3.18-ck1 patchset
Merge branch 'ck-3.18' into pf-3.18