Merge commit 'v2.6.39' into for-2.6.40/core