Apply patch of ROOT-5485