Merges zipVoiceNoScale et al from aspect4 branch