Merge branch 'mg/branch-d-m-f'