Merge commit 'v3.15' into next