Merge branch 'security-CKM' into 'master'