Merge branch 'master' into 'security-CKM' branch