Discovery integration
Merge of the external integration branch with the master.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Merge of the external integration branch with the master.