Fix #598. Update cc menu for D8.