Updates for DMF and deactivation notifications
Merge branch 'my'