Merge branch 'fix/soundcore' into for-linus