Merge branch 'master' into for-4.20/upstream-fixes