Merge "Fix potential overflow in WAV extractor" into oc-dev