Merge commit 'v3.14' into next