Merge branch 'for-7.3/upstream-fixes' into for-next