Merge commit 'v2.6.26' into core/locking