Merge branch 'sec-cmt'