CMK commit 7_14