Port to latest version of 3.6 series