Merge "BUG-4117: Migrating notification-supplier from DCN to DTCN"