Re-release 3.6