Merge pull request #3970 from ey6es/master

Fixes for missing audio device.