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