Merge branch 'dcd_notif' into testing