Merge commit 'v2.6.38' into release