Support latest 6.10.1