Merge branch 'next' into upstream for v3.19