Merge commit 'v2.6.28' into core/core