Backport 3.0.8+ sound support