new_mix to master merge