Feature/cc 610