Merge remote-tracking branch 'pdx86/fixes' into pdx86/for-next