v8.20 fixes roll out issues