Merge branch 'mm/config-edit-global'