Merge "Fix MP3Extractor"