[CHG] Migration to 8.0