Zero fill audio if needed
Merge remote-tracking branch 'main/master'
More code cleanup