Update for latest 3.6.8.Final