Changes due to removal of field avg from struct rq in upstream