Merging M7 changes into SoundCast