Solved small issue regarding mdata status
Fixed conflicts