Mgmt-7

The issue is not finished. Mailing needs testing.