Merge branch 'hle311/spinlock' into hle311/combined