Delete root temp directory eventually
Merge branch 'release-3.6.x'