Merge branch 'topic/sound-core-fix' into to-push