Merge commit 'v2.6.32'