Merge commit 'v3.16' into next