Merge "Remove possible div by zero in WavExtractor"