Backport HTTP added: info
Backport #7237 + #7392 together to minimize conflicts.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Backport #7237 + #7392 together to minimize conflicts.