Support latest 6.8.1, sync local changes