Merge commit 'ce929fe84f9c453263af379f3b255ff8eca01d48'Import CK as of commit 2265c7846f4ce667f5216456afe2779b23c3e5f7.