Merge branch 'master' into fix-early-audio-take2