Merge commit 'v2.6.34.7' into dev-df3210-staging