Support latest 6.9.1