Merge commit 'v2.6.37' into next