Merge changes from Whisper