Add ROOT-4691, ROOT-4802; both will move to v6.02.