Merge "Allow updates to DND configuration activities" into sc-dev