Merged Neutmute Changes