Backport fs added: info
Backport #6499 + #6717 together to minimize conflicts. The former has been marked dont-land-on-v4.x but should generally be safe to backport.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Backport #6499 + #6717 together to minimize conflicts. The former has been marked dont-land-on-v4.x but should generally be safe to backport.