Merge branch 'wan' into release-2.6.27