Merge "CDD: Add requirement for Notification Channels" into oc-dev