Manual merging of mdm-dev branch to mdm branch