Mm dev

Merge for sprint 8