cs_kuhoo_os_10-and-11_merge