Feature/cc 18