Feature/cc 196