Merge branch 'hle311/abort-fixes' into hle311/combined