Merge branch 'v4.16-fixes'