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