Feature/cc 629.1