Merge commit 'v3.17' into next