Fixed audio update issue
Finish merge