Feature/cc 54 4