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